active_git 0.0.9 → 0.0.10

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 1e95bdc2d36b96cfb8b389e72432eddd4e13a7dc
+  data.tar.gz: 34717288b0557eef3d2cef83cadfbfbbb140ebd3
+SHA512:
+  metadata.gz: 0a190e499ca62962593b867f696cc14042e58be92235f617491749408cea467890fb877a064b9fa67d43390ba065012bff2a8465c0d91fbadb62f45ae2e6b83a
+  data.tar.gz: e6892e017b6413906ba5b18490614f980590cb89fb2f53209d195051b4f4acdc6f8ba7a4864609d5ffa6a104176d8db5cdb69951657655b85489c51cad3f9f61

data/.ruby-gemset

@@ -0,0 +1 @@
+active_git

data/.ruby-version

@@ -0,0 +1 @@
+ruby 2.0

data/.travis.yml

@@ -2,6 +2,7 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0
+  - 2.1
   - jruby
 env:
   - DB=postgresql

data/active_git.gemspec

@@ -2,10 +2,10 @@
 require File.expand_path('../lib/active_git/version', __FILE__)
 
 Gem::Specification.new do |s|
-  s.name          = "active_git"
+  s.name          = 'active_git'
   s.version       = ActiveGit::VERSION
-  s.authors       = ["Gabriel Naiman"]
-  s.email         = ["gabynaiman@gmail.com"]
+  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'
@@ -14,17 +14,17 @@ Gem::Specification.new do |s|
   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.require_paths = ['lib']
 
   s.add_dependency 'activerecord', '~> 3.2'
   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 "simplecov"
+  s.add_development_dependency 'bundler', '~> 1.3'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rspec', '~> 2.14.0'
+  s.add_development_dependency 'simplecov'
   if RUBY_ENGINE == 'jruby'
     s.add_development_dependency 'activerecord-jdbcsqlite3-adapter'
     s.add_development_dependency 'activerecord-jdbcpostgresql-adapter'

data/lib/active_git/commands.rb

@@ -49,16 +49,15 @@ module ActiveGit
 
       unless repository.merge(commit)
         resolve_conflicts
-        diffs = diff 'HEAD'
         commit_all 'Resolve conflicts'
       end
 
-      diffs ||= repository.diff(last_log.commit_hash)
+      diffs ||= repository.diff("#{last_log.commit_hash}..HEAD")
       begin
         synchronize_diffs diffs
       rescue => e
         ActiveGit.configuration.logger.error "[ActiveGit] #{e}"
-        last_log ? reset(last_log.commit_hash) : reset
+        repository.reset mode: :hard, commit: last_log.commit_hash || 'HEAD'
         return false
       end
 

data/lib/active_git/version.rb

@@ -1,3 +1,3 @@
 module ActiveGit
-  VERSION = '0.0.9'
+  VERSION = '0.0.10'
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: active_git
 version: !ruby/object:Gem::Version
-  version: 0.0.9
-  prerelease: 
+  version: 0.0.10
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-02 00:00:00.000000000 Z
+date: 2014-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: git_wrapper
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,39 +41,34 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-import
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: easy_diff
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -94,81 +83,71 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: DB and GIT synchronization via ActiveRecord and GitWrapper
@@ -180,6 +159,8 @@ extra_rdoc_files: []
 files:
 - .coveralls.yml
 - .gitignore
+- .ruby-gemset
+- .ruby-version
 - .travis.yml
 - Gemfile
 - LICENSE
@@ -230,33 +211,26 @@ files:
 homepage: https://github.com/gabynaiman/active_git
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3436893494460006310
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3436893494460006310
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: DB and GIT synchronization via ActiveRecord and GitWrapper
 test_files:
 - spec/active_record_extension_spec.rb