spitball-server 0.7.0 → 0.7.1

Sign up to get free protection for your applications and to get access to all the features.
data/CONTRIBUTING.md ADDED
@@ -0,0 +1,67 @@
1
+ # Contributing Guidelines
2
+
3
+ Looking to contribute something? Here's how you can help.
4
+
5
+ ## Bugs reports
6
+
7
+ A bug is a _demonstrable problem_ that is caused by the code in the
8
+ repository. Good bug reports are extremely helpful - thank you!
9
+
10
+ Guidelines for bug reports:
11
+
12
+ 1. **Use the GitHub issue search** - check if the issue has already been
13
+ reported.
14
+
15
+ 2. **Check if the issue has been fixed** - try to reproduce it using the
16
+ latest `master` or development branch in the repository.
17
+
18
+ 3. **Isolate the problem** - ideally create a reduced test case and a live
19
+ example.
20
+
21
+ 4. Please try to be as detailed as possible in your report. Include specific
22
+ information about the environment - operating system and version, versions
23
+ of libraries and steps required to reproduce the issue.
24
+
25
+ ## Feature requests & contribution enquiries
26
+
27
+ Feature requests are welcome. But take a moment to find out whether your idea
28
+ fits with the scope and aims of the project. It's up to *you* to make a strong
29
+ case for the inclusion of your feature. Please provide as much detail and
30
+ context as possible.
31
+
32
+ Contribution enquiries should take place before any significant pull request,
33
+ otherwise you risk spending a lot of time working on something that we might
34
+ have good reasons for rejecting.
35
+
36
+ ## Pull requests
37
+
38
+ Good pull requests - patches, improvements, new features - are a fantastic
39
+ help. They should remain focused in scope and avoid containing unrelated
40
+ commits.
41
+
42
+ Make sure to adhere to the coding conventions used throughout the codebase
43
+ (indentation, accurate comments, etc.) and any other requirements (such as test
44
+ coverage).
45
+
46
+ Please follow this process; it's the best way to get your work included in the
47
+ project:
48
+
49
+ 1. Create a new topic branch to contain your feature, change, or fix:
50
+
51
+ 2. Commit your changes in logical chunks. Provide clear and explanatory commit
52
+ messages. Use git's [interactive rebase](https://help.github.com/articles/interactive-rebase)
53
+ feature to tidy up your commits before making them public.
54
+
55
+ 3. Locally merge (or rebase) the upstream development branch into your topic branch:
56
+
57
+ 4. Push your topic branch up to your fork:
58
+
59
+ 5. [Open a Pull Request](http://help.github.com/send-pull-requests/) with a
60
+ clear title and description.
61
+
62
+ ## License
63
+
64
+ By contributing your code,
65
+
66
+ You agree to license your contribution under the terms of the Apache Public License 2.0
67
+ https://github.com/twitter/spitball/blob/master/LICENSE
data/LICENSE ADDED
@@ -0,0 +1,202 @@
1
+
2
+ Apache License
3
+ Version 2.0, January 2004
4
+ http://www.apache.org/licenses/
5
+
6
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
7
+
8
+ 1. Definitions.
9
+
10
+ "License" shall mean the terms and conditions for use, reproduction,
11
+ and distribution as defined by Sections 1 through 9 of this document.
12
+
13
+ "Licensor" shall mean the copyright owner or entity authorized by
14
+ the copyright owner that is granting the License.
15
+
16
+ "Legal Entity" shall mean the union of the acting entity and all
17
+ other entities that control, are controlled by, or are under common
18
+ control with that entity. For the purposes of this definition,
19
+ "control" means (i) the power, direct or indirect, to cause the
20
+ direction or management of such entity, whether by contract or
21
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
22
+ outstanding shares, or (iii) beneficial ownership of such entity.
23
+
24
+ "You" (or "Your") shall mean an individual or Legal Entity
25
+ exercising permissions granted by this License.
26
+
27
+ "Source" form shall mean the preferred form for making modifications,
28
+ including but not limited to software source code, documentation
29
+ source, and configuration files.
30
+
31
+ "Object" form shall mean any form resulting from mechanical
32
+ transformation or translation of a Source form, including but
33
+ not limited to compiled object code, generated documentation,
34
+ and conversions to other media types.
35
+
36
+ "Work" shall mean the work of authorship, whether in Source or
37
+ Object form, made available under the License, as indicated by a
38
+ copyright notice that is included in or attached to the work
39
+ (an example is provided in the Appendix below).
40
+
41
+ "Derivative Works" shall mean any work, whether in Source or Object
42
+ form, that is based on (or derived from) the Work and for which the
43
+ editorial revisions, annotations, elaborations, or other modifications
44
+ represent, as a whole, an original work of authorship. For the purposes
45
+ of this License, Derivative Works shall not include works that remain
46
+ separable from, or merely link (or bind by name) to the interfaces of,
47
+ the Work and Derivative Works thereof.
48
+
49
+ "Contribution" shall mean any work of authorship, including
50
+ the original version of the Work and any modifications or additions
51
+ to that Work or Derivative Works thereof, that is intentionally
52
+ submitted to Licensor for inclusion in the Work by the copyright owner
53
+ or by an individual or Legal Entity authorized to submit on behalf of
54
+ the copyright owner. For the purposes of this definition, "submitted"
55
+ means any form of electronic, verbal, or written communication sent
56
+ to the Licensor or its representatives, including but not limited to
57
+ communication on electronic mailing lists, source code control systems,
58
+ and issue tracking systems that are managed by, or on behalf of, the
59
+ Licensor for the purpose of discussing and improving the Work, but
60
+ excluding communication that is conspicuously marked or otherwise
61
+ designated in writing by the copyright owner as "Not a Contribution."
62
+
63
+ "Contributor" shall mean Licensor and any individual or Legal Entity
64
+ on behalf of whom a Contribution has been received by Licensor and
65
+ subsequently incorporated within the Work.
66
+
67
+ 2. Grant of Copyright License. Subject to the terms and conditions of
68
+ this License, each Contributor hereby grants to You a perpetual,
69
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
70
+ copyright license to reproduce, prepare Derivative Works of,
71
+ publicly display, publicly perform, sublicense, and distribute the
72
+ Work and such Derivative Works in Source or Object form.
73
+
74
+ 3. Grant of Patent License. Subject to the terms and conditions of
75
+ this License, each Contributor hereby grants to You a perpetual,
76
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
77
+ (except as stated in this section) patent license to make, have made,
78
+ use, offer to sell, sell, import, and otherwise transfer the Work,
79
+ where such license applies only to those patent claims licensable
80
+ by such Contributor that are necessarily infringed by their
81
+ Contribution(s) alone or by combination of their Contribution(s)
82
+ with the Work to which such Contribution(s) was submitted. If You
83
+ institute patent litigation against any entity (including a
84
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
85
+ or a Contribution incorporated within the Work constitutes direct
86
+ or contributory patent infringement, then any patent licenses
87
+ granted to You under this License for that Work shall terminate
88
+ as of the date such litigation is filed.
89
+
90
+ 4. Redistribution. You may reproduce and distribute copies of the
91
+ Work or Derivative Works thereof in any medium, with or without
92
+ modifications, and in Source or Object form, provided that You
93
+ meet the following conditions:
94
+
95
+ (a) You must give any other recipients of the Work or
96
+ Derivative Works a copy of this License; and
97
+
98
+ (b) You must cause any modified files to carry prominent notices
99
+ stating that You changed the files; and
100
+
101
+ (c) You must retain, in the Source form of any Derivative Works
102
+ that You distribute, all copyright, patent, trademark, and
103
+ attribution notices from the Source form of the Work,
104
+ excluding those notices that do not pertain to any part of
105
+ the Derivative Works; and
106
+
107
+ (d) If the Work includes a "NOTICE" text file as part of its
108
+ distribution, then any Derivative Works that You distribute must
109
+ include a readable copy of the attribution notices contained
110
+ within such NOTICE file, excluding those notices that do not
111
+ pertain to any part of the Derivative Works, in at least one
112
+ of the following places: within a NOTICE text file distributed
113
+ as part of the Derivative Works; within the Source form or
114
+ documentation, if provided along with the Derivative Works; or,
115
+ within a display generated by the Derivative Works, if and
116
+ wherever such third-party notices normally appear. The contents
117
+ of the NOTICE file are for informational purposes only and
118
+ do not modify the License. You may add Your own attribution
119
+ notices within Derivative Works that You distribute, alongside
120
+ or as an addendum to the NOTICE text from the Work, provided
121
+ that such additional attribution notices cannot be construed
122
+ as modifying the License.
123
+
124
+ You may add Your own copyright statement to Your modifications and
125
+ may provide additional or different license terms and conditions
126
+ for use, reproduction, or distribution of Your modifications, or
127
+ for any such Derivative Works as a whole, provided Your use,
128
+ reproduction, and distribution of the Work otherwise complies with
129
+ the conditions stated in this License.
130
+
131
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
132
+ any Contribution intentionally submitted for inclusion in the Work
133
+ by You to the Licensor shall be under the terms and conditions of
134
+ this License, without any additional terms or conditions.
135
+ Notwithstanding the above, nothing herein shall supersede or modify
136
+ the terms of any separate license agreement you may have executed
137
+ with Licensor regarding such Contributions.
138
+
139
+ 6. Trademarks. This License does not grant permission to use the trade
140
+ names, trademarks, service marks, or product names of the Licensor,
141
+ except as required for reasonable and customary use in describing the
142
+ origin of the Work and reproducing the content of the NOTICE file.
143
+
144
+ 7. Disclaimer of Warranty. Unless required by applicable law or
145
+ agreed to in writing, Licensor provides the Work (and each
146
+ Contributor provides its Contributions) on an "AS IS" BASIS,
147
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
148
+ implied, including, without limitation, any warranties or conditions
149
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
150
+ PARTICULAR PURPOSE. You are solely responsible for determining the
151
+ appropriateness of using or redistributing the Work and assume any
152
+ risks associated with Your exercise of permissions under this License.
153
+
154
+ 8. Limitation of Liability. In no event and under no legal theory,
155
+ whether in tort (including negligence), contract, or otherwise,
156
+ unless required by applicable law (such as deliberate and grossly
157
+ negligent acts) or agreed to in writing, shall any Contributor be
158
+ liable to You for damages, including any direct, indirect, special,
159
+ incidental, or consequential damages of any character arising as a
160
+ result of this License or out of the use or inability to use the
161
+ Work (including but not limited to damages for loss of goodwill,
162
+ work stoppage, computer failure or malfunction, or any and all
163
+ other commercial damages or losses), even if such Contributor
164
+ has been advised of the possibility of such damages.
165
+
166
+ 9. Accepting Warranty or Additional Liability. While redistributing
167
+ the Work or Derivative Works thereof, You may choose to offer,
168
+ and charge a fee for, acceptance of support, warranty, indemnity,
169
+ or other liability obligations and/or rights consistent with this
170
+ License. However, in accepting such obligations, You may act only
171
+ on Your own behalf and on Your sole responsibility, not on behalf
172
+ of any other Contributor, and only if You agree to indemnify,
173
+ defend, and hold each Contributor harmless for any liability
174
+ incurred by, or claims asserted against, such Contributor by reason
175
+ of your accepting any such warranty or additional liability.
176
+
177
+ END OF TERMS AND CONDITIONS
178
+
179
+ APPENDIX: How to apply the Apache License to your work.
180
+
181
+ To apply the Apache License to your work, attach the following
182
+ boilerplate notice, with the fields enclosed by brackets "[]"
183
+ replaced with your own identifying information. (Don't include
184
+ the brackets!) The text should be enclosed in the appropriate
185
+ comment syntax for the file format. We also recommend that a
186
+ file or class name and description of purpose be included on the
187
+ same "printed page" as the copyright notice for easier
188
+ identification within third-party archives.
189
+
190
+ Copyright [yyyy] [name of copyright owner]
191
+
192
+ Licensed under the Apache License, Version 2.0 (the "License");
193
+ you may not use this file except in compliance with the License.
194
+ You may obtain a copy of the License at
195
+
196
+ http://www.apache.org/licenses/LICENSE-2.0
197
+
198
+ Unless required by applicable law or agreed to in writing, software
199
+ distributed under the License is distributed on an "AS IS" BASIS,
200
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
201
+ See the License for the specific language governing permissions and
202
+ limitations under the License.
@@ -1,3 +1,3 @@
1
1
  class Spitball
2
- VERSION = '0.7.0' unless const_defined?(:VERSION)
2
+ VERSION = '0.7.1' unless const_defined?(:VERSION)
3
3
  end
data/lib/spitball.rb CHANGED
@@ -2,6 +2,7 @@ require 'fileutils'
2
2
  require 'digest/md5'
3
3
  require 'ext/bundler_lockfile_parser'
4
4
  require 'ext/bundler_fake_dsl'
5
+ require 'sem_ver'
5
6
 
6
7
  $pwd = Dir.pwd
7
8
 
@@ -145,6 +146,7 @@ class Spitball
145
146
  sort.
146
147
  map{|s| %w{gemcutter rubygems rubyforge}.include?(s) ? "http://rubygems.org" : s}).
147
148
  map{|s| "--source #{s}"}.
149
+ map{|s| "#{"--clear-sources " if SemVer.parse(Gem.rubygems_version.to_s) >= SemVer.parse('1.4.0') }#{s}"}.
148
150
  join(' ')
149
151
  end
150
152
 
@@ -134,6 +134,22 @@ describe Spitball do
134
134
  @spitball.send :create_bundle
135
135
  end
136
136
  end
137
+
138
+ context "sources_opt" do
139
+ it "does not add --clear sources for rubygems >= 1.4.0" do
140
+ @spitball = Spitball.new(@gemfile, @lockfile)
141
+ parsed_lockfile = @spitball.instance_variable_get("@parsed_lockfile")
142
+ stub(Gem).rubygems_version { "1.3.10" }
143
+ @spitball.send(:sources_opt, parsed_lockfile.sources).should == "--source http://rubygems.org/"
144
+ end
145
+
146
+ it "does not add --clear sources for rubygems >= 1.4.0" do
147
+ @spitball = Spitball.new(@gemfile, @lockfile)
148
+ parsed_lockfile = @spitball.instance_variable_get("@parsed_lockfile")
149
+ stub(Gem).rubygems_version { "1.4.0" }
150
+ @spitball.send(:sources_opt, parsed_lockfile.sources).should == "--clear-sources --source http://rubygems.org/"
151
+ end
152
+ end
137
153
  end
138
154
 
139
155
  describe Spitball::FileLock do
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
19
19
  s.require_paths = ["lib"]
20
20
 
21
21
  s.add_dependency 'json'
22
+ s.add_dependency 'sem_ver'
22
23
  s.add_dependency 'sinatra', '~> 1.2.0'
23
24
  s.add_development_dependency 'rspec', "~> 1.3.0"
24
25
  s.add_development_dependency 'diff-lcs'
data/spitball.gemspec CHANGED
@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
7
7
  s.platform = Gem::Platform::RUBY
8
8
  s.authors = ["Matt Freels", "Brandon Mitchell", "Joshua Hull"]
9
9
  s.email = "freels@twitter.com"
10
- s.homepage = "http://rubygems.org/gems/spitball"
10
+ s.homepage = "http://github.com/twitter/spitball"
11
11
  s.summary = %q{Use bundler to generate gem tarball packages}
12
12
  s.description = %q{Use bundler to generate gem tarball packages.}
13
13
 
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: spitball-server
3
3
  version: !ruby/object:Gem::Version
4
- hash: 3
4
+ hash: 1
5
5
  prerelease:
6
6
  segments:
7
7
  - 0
8
8
  - 7
9
- - 0
10
- version: 0.7.0
9
+ - 1
10
+ version: 0.7.1
11
11
  platform: ruby
12
12
  authors:
13
13
  - Matt Freels
@@ -17,7 +17,7 @@ autorequire:
17
17
  bindir: bin
18
18
  cert_chain: []
19
19
 
20
- date: 2013-11-12 00:00:00 Z
20
+ date: 2013-11-19 00:00:00 Z
21
21
  dependencies:
22
22
  - !ruby/object:Gem::Dependency
23
23
  requirement: &id001 !ruby/object:Gem::Requirement
@@ -35,6 +35,20 @@ dependencies:
35
35
  version_requirements: *id001
36
36
  - !ruby/object:Gem::Dependency
37
37
  requirement: &id002 !ruby/object:Gem::Requirement
38
+ none: false
39
+ requirements:
40
+ - - ">="
41
+ - !ruby/object:Gem::Version
42
+ hash: 3
43
+ segments:
44
+ - 0
45
+ version: "0"
46
+ name: sem_ver
47
+ prerelease: false
48
+ type: :runtime
49
+ version_requirements: *id002
50
+ - !ruby/object:Gem::Dependency
51
+ requirement: &id003 !ruby/object:Gem::Requirement
38
52
  none: false
39
53
  requirements:
40
54
  - - ~>
@@ -48,9 +62,9 @@ dependencies:
48
62
  name: sinatra
49
63
  prerelease: false
50
64
  type: :runtime
51
- version_requirements: *id002
65
+ version_requirements: *id003
52
66
  - !ruby/object:Gem::Dependency
53
- requirement: &id003 !ruby/object:Gem::Requirement
67
+ requirement: &id004 !ruby/object:Gem::Requirement
54
68
  none: false
55
69
  requirements:
56
70
  - - ~>
@@ -64,9 +78,9 @@ dependencies:
64
78
  name: rspec
65
79
  prerelease: false
66
80
  type: :development
67
- version_requirements: *id003
81
+ version_requirements: *id004
68
82
  - !ruby/object:Gem::Dependency
69
- requirement: &id004 !ruby/object:Gem::Requirement
83
+ requirement: &id005 !ruby/object:Gem::Requirement
70
84
  none: false
71
85
  requirements:
72
86
  - - ">="
@@ -78,9 +92,9 @@ dependencies:
78
92
  name: diff-lcs
79
93
  prerelease: false
80
94
  type: :development
81
- version_requirements: *id004
95
+ version_requirements: *id005
82
96
  - !ruby/object:Gem::Dependency
83
- requirement: &id005 !ruby/object:Gem::Requirement
97
+ requirement: &id006 !ruby/object:Gem::Requirement
84
98
  none: false
85
99
  requirements:
86
100
  - - ">="
@@ -92,9 +106,9 @@ dependencies:
92
106
  name: rr
93
107
  prerelease: false
94
108
  type: :development
95
- version_requirements: *id005
109
+ version_requirements: *id006
96
110
  - !ruby/object:Gem::Dependency
97
- requirement: &id006 !ruby/object:Gem::Requirement
111
+ requirement: &id007 !ruby/object:Gem::Requirement
98
112
  none: false
99
113
  requirements:
100
114
  - - "="
@@ -108,9 +122,9 @@ dependencies:
108
122
  name: rake
109
123
  prerelease: false
110
124
  type: :development
111
- version_requirements: *id006
125
+ version_requirements: *id007
112
126
  - !ruby/object:Gem::Dependency
113
- requirement: &id007 !ruby/object:Gem::Requirement
127
+ requirement: &id008 !ruby/object:Gem::Requirement
114
128
  none: false
115
129
  requirements:
116
130
  - - ">="
@@ -122,7 +136,7 @@ dependencies:
122
136
  name: phocus
123
137
  prerelease: false
124
138
  type: :development
125
- version_requirements: *id007
139
+ version_requirements: *id008
126
140
  description: Use bundler to generate gem tarball packages - server!
127
141
  email: freels@twitter.com
128
142
  executables:
@@ -135,7 +149,9 @@ extra_rdoc_files: []
135
149
  files:
136
150
  - .gitignore
137
151
  - .travis.yml
152
+ - CONTRIBUTING.md
138
153
  - Gemfile
154
+ - LICENSE
139
155
  - README.md
140
156
  - Rakefile
141
157
  - bin/spitball