git_pretty_accept 0.5.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2469b255e1c0e2d603c2b8f4e887635aa8ea1e8a
-  data.tar.gz: 56f5aae9dbbffdde6787fd106013bb216c02ae7e
+  metadata.gz: c77e4b823e7261e569bd8d26a6066c8bab2789d4
+  data.tar.gz: fa3e209a951b84141b0d678e844c9f44c15b840b
 SHA512:
-  metadata.gz: a9281aba1323f9126f53cbe01292edd744aa64d53c0b48d9b2df2d23dabb8a7e5012d56d62b239d52f41c9839d0ed86467cdfb4224df86915315db08dbcdf934
-  data.tar.gz: 7d140366f1643b73d0f163b48b47a3addfaa5c0009265bbbbdbae205f71f30c6ce046ef2cf0ad37f97e974daef4494bfaac5161c6b02f50cdf86d0fdc2c5d697
+  metadata.gz: fb8d22c6161f9f04fb1e4b2cbd14817467914d2d624b1befcde0926078fe24328c5b674ef476ee99d8b72ac2fa511e4d6b50250f16a3bc59084d7c8fdd0e5dc0
+  data.tar.gz: 3357c0d7420bf6d876756c6687a785a5fa7db088e336aa30ceccd0b7a0f720ad68aa861dcbe8df291c0406c6238c858818a2df49cf8dce12b15e3795cde414a6

data/.travis.yml

@@ -3,8 +3,6 @@ before_script:
   - git config --global user.name "Your Name"
 script: bundle exec rspec
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.0
-  - rbx
+  - 2.2.3
+  - 2.4.0
 cache: bundler

data/CHANGELOG.markdown

@@ -2,6 +2,10 @@
 
 ## 0.5.0 - 2015-03-20
 
+* Update supported Ruby versions to 2.2.3 and 2.4.
+
+## 0.5.0 - 2015-03-20
+
 * Enable autosquash mode when rebasing by default.
 
 ## 0.4.0 - 2014-02-20

data/README.md

@@ -55,11 +55,6 @@ script
 1. Rebases the local branch in interactive mode so that it can run
   autosquash(See `--autosquash` under http://git-scm.com/docs/git-rebase#_options).
 
-## Known to be working on
-
-* git 2.3.3
-* ruby 2.0.0
-
 ## Contributing
 
 1. Fork it

data/git_pretty_accept.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'git'
-  spec.add_dependency 'methadone', '~> 1.3.1'
+  spec.add_dependency 'methadone', '~> 1.9'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'guard'
@@ -35,4 +35,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '~> 2.14.0'
   spec.add_development_dependency 'rspec-example_steps', '~> 0.2.5'
+
+  # Must set version in order to run 'bundle update'.
+  # Can be removed once upgraded to ruby >= 2.2.5
+  # https://github.com/e2/ruby_dep
+  spec.add_development_dependency 'ruby_dep', '~> 1.3.1'
 end

data/lib/git_pretty_accept/version.rb

@@ -1,3 +1,3 @@
 module GitPrettyAccept
-  VERSION = '0.5.0'
+  VERSION = '1.0.0'
 end

data/spec/git_pretty_accept/app_spec.rb

@@ -185,9 +185,16 @@ describe GitPrettyAccept::App do
     end
 
     And 'both local and remote PR branch have been updated' do
+      # Delay commit of local_pr_message by 1 full second. Git gem
+      # seems to be confused when commits are too close to each other.
+      sleep 1
       local_repo.commit_some_change local_pr_message
 
       other_repo.checkout pr_branch
+
+      # Delay commit of remote_pr_message by 1 full second. Git gem
+      # seems to be confused when commits are too close to each other.
+      sleep 1
       other_repo.push_some_change remote_pr_message
     end
 
@@ -208,9 +215,7 @@ describe GitPrettyAccept::App do
       expect(local_repo.git.log[1].message).to eq(local_pr_message)
       expect(local_repo.git.log[1].parents.size).to eq(1)
 
-      # For some reason, the order of the logs 2 and 3 is indeterminate.
-      expect(local_repo.git.log[2 .. 3].map(&:message).sort)
-        .to include(remote_pr_message)
+      expect(local_repo.git.log[2].message).to eq(remote_pr_message)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_pretty_accept
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Love With Food, George Mendoza
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-20 00:00:00.000000000 Z
+date: 2017-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: '1.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +150,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.5
+- !ruby/object:Gem::Dependency
+  name: ruby_dep
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.1
 description: " `git-pretty-accept` is a script that rebases a pull request before
   merging to master. Pull requests are _always_ merged recursively. The result is
   a linear history with merge bubbles indicating pull requests. In short, pretty. "
@@ -199,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Accept pull requests, the pretty way