git-smart-ng 1.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (34) hide show
  1. checksums.yaml +7 -0
  2. data/Gemfile +10 -0
  3. data/Gemfile.lock +36 -0
  4. data/LICENSE.txt +20 -0
  5. data/README.md +68 -0
  6. data/Rakefile +71 -0
  7. data/VERSION +1 -0
  8. data/bin/git-smart-log +7 -0
  9. data/bin/git-smart-merge +7 -0
  10. data/bin/git-smart-pull +7 -0
  11. data/docs/images/git-smart.png +0 -0
  12. data/docs/images/smart-log-comparison.png +0 -0
  13. data/docs/images/smart-pull-screenshot.png +0 -0
  14. data/docs/introductory_blog_post.md +43 -0
  15. data/docs/smart-log.html +59 -0
  16. data/docs/smart-merge.html +212 -0
  17. data/docs/smart-pull.html +304 -0
  18. data/lib/commands/smart-log.rb +9 -0
  19. data/lib/commands/smart-merge.rb +63 -0
  20. data/lib/commands/smart-pull.rb +117 -0
  21. data/lib/core_ext/array.rb +9 -0
  22. data/lib/core_ext/hash.rb +21 -0
  23. data/lib/core_ext/object.rb +8 -0
  24. data/lib/git-smart/exceptions.rb +10 -0
  25. data/lib/git-smart/execution_context.rb +39 -0
  26. data/lib/git-smart/git_repo.rb +172 -0
  27. data/lib/git-smart/git_smart.rb +28 -0
  28. data/lib/git-smart/safe_shell.rb +21 -0
  29. data/lib/git-smart.rb +8 -0
  30. data/spec/smart-merge_failures_spec.rb +49 -0
  31. data/spec/smart-merge_spec.rb +104 -0
  32. data/spec/smart-pull_spec.rb +215 -0
  33. data/spec/spec_helper.rb +65 -0
  34. metadata +140 -0
metadata ADDED
@@ -0,0 +1,140 @@
1
+ --- !ruby/object:Gem::Specification
2
+ name: git-smart-ng
3
+ version: !ruby/object:Gem::Version
4
+ version: 1.0.0
5
+ platform: ruby
6
+ authors:
7
+ - Glen Maddern
8
+ - Colin Rymer
9
+ autorequire:
10
+ bindir: bin
11
+ cert_chain: []
12
+ date: 2011-01-06 00:00:00.000000000 Z
13
+ dependencies:
14
+ - !ruby/object:Gem::Dependency
15
+ name: colorize
16
+ requirement: !ruby/object:Gem::Requirement
17
+ requirements:
18
+ - - ">="
19
+ - !ruby/object:Gem::Version
20
+ version: '0'
21
+ type: :runtime
22
+ prerelease: false
23
+ version_requirements: !ruby/object:Gem::Requirement
24
+ requirements:
25
+ - - ">="
26
+ - !ruby/object:Gem::Version
27
+ version: '0'
28
+ - !ruby/object:Gem::Dependency
29
+ name: rspec
30
+ requirement: !ruby/object:Gem::Requirement
31
+ requirements:
32
+ - - ">="
33
+ - !ruby/object:Gem::Version
34
+ version: 2.7.0
35
+ type: :development
36
+ prerelease: false
37
+ version_requirements: !ruby/object:Gem::Requirement
38
+ requirements:
39
+ - - ">="
40
+ - !ruby/object:Gem::Version
41
+ version: 2.7.0
42
+ - !ruby/object:Gem::Dependency
43
+ name: rcov
44
+ requirement: !ruby/object:Gem::Requirement
45
+ requirements:
46
+ - - ">="
47
+ - !ruby/object:Gem::Version
48
+ version: '0'
49
+ type: :development
50
+ prerelease: false
51
+ version_requirements: !ruby/object:Gem::Requirement
52
+ requirements:
53
+ - - ">="
54
+ - !ruby/object:Gem::Version
55
+ version: '0'
56
+ - !ruby/object:Gem::Dependency
57
+ name: rocco
58
+ requirement: !ruby/object:Gem::Requirement
59
+ requirements:
60
+ - - ">="
61
+ - !ruby/object:Gem::Version
62
+ version: '0'
63
+ type: :development
64
+ prerelease: false
65
+ version_requirements: !ruby/object:Gem::Requirement
66
+ requirements:
67
+ - - ">="
68
+ - !ruby/object:Gem::Version
69
+ version: '0'
70
+ description: Installs some additional 'smart' git commands, like `git smart-pull`.
71
+ email: glenmaddern@gmail.com, colin.rymer@gmail.com
72
+ executables:
73
+ - git-smart-log
74
+ - git-smart-merge
75
+ - git-smart-pull
76
+ extensions: []
77
+ extra_rdoc_files:
78
+ - LICENSE.txt
79
+ - README.md
80
+ files:
81
+ - Gemfile
82
+ - Gemfile.lock
83
+ - LICENSE.txt
84
+ - README.md
85
+ - Rakefile
86
+ - VERSION
87
+ - bin/git-smart-log
88
+ - bin/git-smart-merge
89
+ - bin/git-smart-pull
90
+ - docs/images/git-smart.png
91
+ - docs/images/smart-log-comparison.png
92
+ - docs/images/smart-pull-screenshot.png
93
+ - docs/introductory_blog_post.md
94
+ - docs/smart-log.html
95
+ - docs/smart-merge.html
96
+ - docs/smart-pull.html
97
+ - lib/commands/smart-log.rb
98
+ - lib/commands/smart-merge.rb
99
+ - lib/commands/smart-pull.rb
100
+ - lib/core_ext/array.rb
101
+ - lib/core_ext/hash.rb
102
+ - lib/core_ext/object.rb
103
+ - lib/git-smart.rb
104
+ - lib/git-smart/exceptions.rb
105
+ - lib/git-smart/execution_context.rb
106
+ - lib/git-smart/git_repo.rb
107
+ - lib/git-smart/git_smart.rb
108
+ - lib/git-smart/safe_shell.rb
109
+ - spec/smart-merge_failures_spec.rb
110
+ - spec/smart-merge_spec.rb
111
+ - spec/smart-pull_spec.rb
112
+ - spec/spec_helper.rb
113
+ homepage: http://github.com/geelen/git-smart
114
+ licenses:
115
+ - MIT
116
+ metadata: {}
117
+ post_install_message:
118
+ rdoc_options: []
119
+ require_paths:
120
+ - lib
121
+ required_ruby_version: !ruby/object:Gem::Requirement
122
+ requirements:
123
+ - - ">="
124
+ - !ruby/object:Gem::Version
125
+ version: '0'
126
+ required_rubygems_version: !ruby/object:Gem::Requirement
127
+ requirements:
128
+ - - ">="
129
+ - !ruby/object:Gem::Version
130
+ version: '0'
131
+ requirements: []
132
+ rubygems_version: 3.0.3.1
133
+ signing_key:
134
+ specification_version: 4
135
+ summary: Add some smarts to your git workflow
136
+ test_files:
137
+ - spec/smart-merge_failures_spec.rb
138
+ - spec/smart-merge_spec.rb
139
+ - spec/smart-pull_spec.rb
140
+ - spec/spec_helper.rb