bundler 1.0.22 → 1.1.pre

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of bundler might be problematic. Click here for more details.

Files changed (114) hide show
  1. data/CHANGELOG.md +15 -181
  2. data/ISSUES.md +11 -26
  3. data/LICENSE +0 -2
  4. data/Rakefile +67 -116
  5. data/UPGRADING.md +4 -4
  6. data/bin/bundle +10 -10
  7. data/bundler.gemspec +5 -5
  8. data/lib/bundler.rb +15 -25
  9. data/lib/bundler/capistrano.rb +2 -2
  10. data/lib/bundler/cli.rb +41 -72
  11. data/lib/bundler/definition.rb +11 -37
  12. data/lib/bundler/dependency.rb +9 -13
  13. data/lib/bundler/deployment.rb +3 -8
  14. data/lib/bundler/dsl.rb +10 -24
  15. data/lib/bundler/fetcher.rb +101 -0
  16. data/lib/bundler/gem_helper.rb +6 -11
  17. data/lib/bundler/index.rb +8 -15
  18. data/lib/bundler/installer.rb +55 -35
  19. data/lib/bundler/lazy_specification.rb +7 -10
  20. data/lib/bundler/remote_specification.rb +6 -8
  21. data/lib/bundler/resolver.rb +18 -12
  22. data/lib/bundler/rubygems_ext.rb +3 -20
  23. data/lib/bundler/runtime.rb +57 -8
  24. data/lib/bundler/settings.rb +6 -4
  25. data/lib/bundler/setup.rb +5 -12
  26. data/lib/bundler/shared_helpers.rb +100 -4
  27. data/lib/bundler/source.rb +61 -106
  28. data/lib/bundler/spec_set.rb +8 -9
  29. data/lib/bundler/templates/newgem/Rakefile.tt +2 -1
  30. data/lib/bundler/templates/newgem/lib/newgem.rb.tt +0 -2
  31. data/lib/bundler/templates/newgem/newgem.gemspec.tt +3 -6
  32. data/lib/bundler/ui.rb +1 -4
  33. data/lib/bundler/vendor/net/http/faster.rb +27 -0
  34. data/lib/bundler/vendor/net/http/persistent.rb +464 -0
  35. data/lib/bundler/vendor/thor.rb +4 -43
  36. data/lib/bundler/vendor/thor/actions.rb +11 -28
  37. data/lib/bundler/vendor/thor/actions/create_file.rb +2 -2
  38. data/lib/bundler/vendor/thor/actions/directory.rb +2 -2
  39. data/lib/bundler/vendor/thor/actions/empty_directory.rb +0 -0
  40. data/lib/bundler/vendor/thor/actions/file_manipulation.rb +15 -56
  41. data/lib/bundler/vendor/thor/actions/inject_into_file.rb +10 -15
  42. data/lib/bundler/vendor/thor/base.rb +4 -24
  43. data/lib/bundler/vendor/thor/core_ext/file_binary_read.rb +0 -0
  44. data/lib/bundler/vendor/thor/core_ext/hash_with_indifferent_access.rb +0 -0
  45. data/lib/bundler/vendor/thor/core_ext/ordered_hash.rb +0 -0
  46. data/lib/bundler/vendor/thor/error.rb +0 -0
  47. data/lib/bundler/vendor/thor/invocation.rb +0 -0
  48. data/lib/bundler/vendor/thor/parser.rb +0 -0
  49. data/lib/bundler/vendor/thor/parser/argument.rb +0 -0
  50. data/lib/bundler/vendor/thor/parser/arguments.rb +2 -2
  51. data/lib/bundler/vendor/thor/parser/option.rb +1 -1
  52. data/lib/bundler/vendor/thor/parser/options.rb +16 -17
  53. data/lib/bundler/vendor/thor/shell.rb +0 -0
  54. data/lib/bundler/vendor/thor/shell/basic.rb +13 -40
  55. data/lib/bundler/vendor/thor/shell/color.rb +0 -0
  56. data/lib/bundler/vendor/thor/task.rb +4 -3
  57. data/lib/bundler/vendor/thor/util.rb +2 -2
  58. data/lib/bundler/vendor/thor/version.rb +1 -1
  59. data/lib/bundler/version.rb +1 -1
  60. data/lib/bundler/vlad.rb +0 -2
  61. data/man/bundle-install.ronn +3 -6
  62. data/man/gemfile.5.ronn +2 -7
  63. data/spec/cache/gems_spec.rb +0 -11
  64. data/spec/cache/git_spec.rb +2 -5
  65. data/spec/install/deploy_spec.rb +8 -8
  66. data/spec/install/gems/dependency_api_spec.rb +85 -0
  67. data/spec/install/gems/flex_spec.rb +4 -4
  68. data/spec/install/gems/groups_spec.rb +3 -17
  69. data/spec/install/gems/platform_spec.rb +16 -0
  70. data/spec/install/gems/simple_case_spec.rb +24 -88
  71. data/spec/install/gems/standalone_spec.rb +162 -0
  72. data/spec/install/gems/sudo_spec.rb +2 -3
  73. data/spec/install/gemspec_spec.rb +0 -38
  74. data/spec/install/git_spec.rb +4 -3
  75. data/spec/install/invalid_spec.rb +0 -18
  76. data/spec/install/path_spec.rb +1 -53
  77. data/spec/lock/git_spec.rb +1 -1
  78. data/spec/lock/lockfile_spec.rb +16 -72
  79. data/spec/other/check_spec.rb +6 -6
  80. data/spec/other/clean_spec.rb +202 -0
  81. data/spec/other/exec_spec.rb +7 -14
  82. data/spec/other/ext_spec.rb +0 -21
  83. data/spec/{bundler → other}/gem_helper_spec.rb +1 -16
  84. data/spec/other/help_spec.rb +1 -2
  85. data/spec/other/init_spec.rb +3 -3
  86. data/spec/other/newgem_spec.rb +1 -23
  87. data/spec/pack/gems_spec.rb +22 -0
  88. data/spec/quality_spec.rb +2 -6
  89. data/spec/runtime/require_spec.rb +10 -10
  90. data/spec/runtime/setup_spec.rb +12 -54
  91. data/spec/spec_helper.rb +7 -14
  92. data/spec/support/artifice/endpoint.rb +50 -0
  93. data/spec/support/artifice/endpoint_fallback.rb +22 -0
  94. data/spec/support/artifice/endpoint_marshal_fail.rb +11 -0
  95. data/spec/support/artifice/endpoint_redirect.rb +11 -0
  96. data/spec/support/builders.rb +2 -25
  97. data/spec/support/fakeweb/rack-1.0.0.marshal +2 -0
  98. data/spec/support/fakeweb/windows.rb +23 -0
  99. data/spec/support/helpers.rb +12 -5
  100. data/spec/support/matchers.rb +16 -4
  101. data/spec/support/path.rb +2 -0
  102. data/spec/support/rubygems_ext.rb +2 -6
  103. data/spec/update/gems_spec.rb +2 -3
  104. data/spec/update/git_spec.rb +2 -2
  105. metadata +41 -24
  106. data/.travis.yml +0 -31
  107. data/lib/bundler/gem_installer.rb +0 -9
  108. data/lib/bundler/gem_tasks.rb +0 -2
  109. data/lib/bundler/rubygems_integration.rb +0 -344
  110. data/lib/bundler/vendor/thor/actions/create_link.rb +0 -57
  111. data/lib/bundler/vendor/thor/group.rb +0 -273
  112. data/lib/bundler/vendor/thor/rake_compat.rb +0 -66
  113. data/lib/bundler/vendor/thor/runner.rb +0 -309
  114. data/lib/bundler/vendored_thor.rb +0 -7
@@ -1,66 +0,0 @@
1
- require 'rake'
2
-
3
- class Thor
4
- # Adds a compatibility layer to your Thor classes which allows you to use
5
- # rake package tasks. For example, to use rspec rake tasks, one can do:
6
- #
7
- # require 'thor/rake_compat'
8
- #
9
- # class Default < Thor
10
- # include Thor::RakeCompat
11
- #
12
- # Spec::Rake::SpecTask.new(:spec) do |t|
13
- # t.spec_opts = ['--options', "spec/spec.opts"]
14
- # t.spec_files = FileList['spec/**/*_spec.rb']
15
- # end
16
- # end
17
- #
18
- module RakeCompat
19
- def self.rake_classes
20
- @rake_classes ||= []
21
- end
22
-
23
- def self.included(base)
24
- # Hack. Make rakefile point to invoker, so rdoc task is generated properly.
25
- rakefile = File.basename(caller[0].match(/(.*):\d+/)[1])
26
- Rake.application.instance_variable_set(:@rakefile, rakefile)
27
- self.rake_classes << base
28
- end
29
- end
30
- end
31
-
32
- class Object #:nodoc:
33
- alias :rake_task :task
34
- alias :rake_namespace :namespace
35
-
36
- def task(*args, &block)
37
- task = rake_task(*args, &block)
38
-
39
- if klass = Thor::RakeCompat.rake_classes.last
40
- non_namespaced_name = task.name.split(':').last
41
-
42
- description = non_namespaced_name
43
- description << task.arg_names.map{ |n| n.to_s.upcase }.join(' ')
44
- description.strip!
45
-
46
- klass.desc description, task.comment || non_namespaced_name
47
- klass.send :define_method, non_namespaced_name do |*args|
48
- Rake::Task[task.name.to_sym].invoke(*args)
49
- end
50
- end
51
-
52
- task
53
- end
54
-
55
- def namespace(name, &block)
56
- if klass = Thor::RakeCompat.rake_classes.last
57
- const_name = Thor::Util.camel_case(name.to_s).to_sym
58
- klass.const_set(const_name, Class.new(Thor))
59
- new_klass = klass.const_get(const_name)
60
- Thor::RakeCompat.rake_classes << new_klass
61
- end
62
-
63
- rake_namespace(name, &block)
64
- Thor::RakeCompat.rake_classes.pop
65
- end
66
- end
@@ -1,309 +0,0 @@
1
- require 'thor'
2
- require 'thor/group'
3
- require 'thor/core_ext/file_binary_read'
4
-
5
- require 'fileutils'
6
- require 'open-uri'
7
- require 'yaml'
8
- require 'digest/md5'
9
- require 'pathname'
10
-
11
- class Thor::Runner < Thor #:nodoc:
12
- map "-T" => :list, "-i" => :install, "-u" => :update, "-v" => :version
13
-
14
- # Override Thor#help so it can give information about any class and any method.
15
- #
16
- def help(meth = nil)
17
- if meth && !self.respond_to?(meth)
18
- initialize_thorfiles(meth)
19
- klass, task = Thor::Util.find_class_and_task_by_namespace(meth)
20
- klass.start(["-h", task].compact, :shell => self.shell)
21
- else
22
- super
23
- end
24
- end
25
-
26
- # If a task is not found on Thor::Runner, method missing is invoked and
27
- # Thor::Runner is then responsable for finding the task in all classes.
28
- #
29
- def method_missing(meth, *args)
30
- meth = meth.to_s
31
- initialize_thorfiles(meth)
32
- klass, task = Thor::Util.find_class_and_task_by_namespace(meth)
33
- args.unshift(task) if task
34
- klass.start(args, :shell => self.shell)
35
- end
36
-
37
- desc "install NAME", "Install an optionally named Thor file into your system tasks"
38
- method_options :as => :string, :relative => :boolean, :force => :boolean
39
- def install(name)
40
- initialize_thorfiles
41
-
42
- # If a directory name is provided as the argument, look for a 'main.thor'
43
- # task in said directory.
44
- begin
45
- if File.directory?(File.expand_path(name))
46
- base, package = File.join(name, "main.thor"), :directory
47
- contents = open(base) {|input| input.read }
48
- else
49
- base, package = name, :file
50
- contents = open(name) {|input| input.read }
51
- end
52
- rescue OpenURI::HTTPError
53
- raise Error, "Error opening URI '#{name}'"
54
- rescue Errno::ENOENT
55
- raise Error, "Error opening file '#{name}'"
56
- end
57
-
58
- say "Your Thorfile contains:"
59
- say contents
60
-
61
- unless options["force"]
62
- return false if no?("Do you wish to continue [y/N]?")
63
- end
64
-
65
- as = options["as"] || begin
66
- first_line = contents.split("\n")[0]
67
- (match = first_line.match(/\s*#\s*module:\s*([^\n]*)/)) ? match[1].strip : nil
68
- end
69
-
70
- unless as
71
- basename = File.basename(name)
72
- as = ask("Please specify a name for #{name} in the system repository [#{basename}]:")
73
- as = basename if as.empty?
74
- end
75
-
76
- location = if options[:relative] || name =~ /^https?:\/\//
77
- name
78
- else
79
- File.expand_path(name)
80
- end
81
-
82
- thor_yaml[as] = {
83
- :filename => Digest::MD5.hexdigest(name + as),
84
- :location => location,
85
- :namespaces => Thor::Util.namespaces_in_content(contents, base)
86
- }
87
-
88
- save_yaml(thor_yaml)
89
- say "Storing thor file in your system repository"
90
- destination = File.join(thor_root, thor_yaml[as][:filename])
91
-
92
- if package == :file
93
- File.open(destination, "w") { |f| f.puts contents }
94
- else
95
- FileUtils.cp_r(name, destination)
96
- end
97
-
98
- thor_yaml[as][:filename] # Indicate success
99
- end
100
-
101
- desc "version", "Show Thor version"
102
- def version
103
- require 'thor/version'
104
- say "Thor #{Thor::VERSION}"
105
- end
106
-
107
- desc "uninstall NAME", "Uninstall a named Thor module"
108
- def uninstall(name)
109
- raise Error, "Can't find module '#{name}'" unless thor_yaml[name]
110
- say "Uninstalling #{name}."
111
- FileUtils.rm_rf(File.join(thor_root, "#{thor_yaml[name][:filename]}"))
112
-
113
- thor_yaml.delete(name)
114
- save_yaml(thor_yaml)
115
-
116
- puts "Done."
117
- end
118
-
119
- desc "update NAME", "Update a Thor file from its original location"
120
- def update(name)
121
- raise Error, "Can't find module '#{name}'" if !thor_yaml[name] || !thor_yaml[name][:location]
122
-
123
- say "Updating '#{name}' from #{thor_yaml[name][:location]}"
124
-
125
- old_filename = thor_yaml[name][:filename]
126
- self.options = self.options.merge("as" => name)
127
- filename = install(thor_yaml[name][:location])
128
-
129
- unless filename == old_filename
130
- File.delete(File.join(thor_root, old_filename))
131
- end
132
- end
133
-
134
- desc "installed", "List the installed Thor modules and tasks"
135
- method_options :internal => :boolean
136
- def installed
137
- initialize_thorfiles(nil, true)
138
- display_klasses(true, options["internal"])
139
- end
140
-
141
- desc "list [SEARCH]", "List the available thor tasks (--substring means .*SEARCH)"
142
- method_options :substring => :boolean, :group => :string, :all => :boolean, :debug => :boolean
143
- def list(search="")
144
- initialize_thorfiles
145
-
146
- search = ".*#{search}" if options["substring"]
147
- search = /^#{search}.*/i
148
- group = options[:group] || "standard"
149
-
150
- klasses = Thor::Base.subclasses.select do |k|
151
- (options[:all] || k.group == group) && k.namespace =~ search
152
- end
153
-
154
- display_klasses(false, false, klasses)
155
- end
156
-
157
- private
158
-
159
- def self.banner(task, all = false, subcommand = false)
160
- "thor " + task.formatted_usage(self, all, subcommand)
161
- end
162
-
163
- def thor_root
164
- Thor::Util.thor_root
165
- end
166
-
167
- def thor_yaml
168
- @thor_yaml ||= begin
169
- yaml_file = File.join(thor_root, "thor.yml")
170
- yaml = YAML.load_file(yaml_file) if File.exists?(yaml_file)
171
- yaml || {}
172
- end
173
- end
174
-
175
- # Save the yaml file. If none exists in thor root, creates one.
176
- #
177
- def save_yaml(yaml)
178
- yaml_file = File.join(thor_root, "thor.yml")
179
-
180
- unless File.exists?(yaml_file)
181
- FileUtils.mkdir_p(thor_root)
182
- yaml_file = File.join(thor_root, "thor.yml")
183
- FileUtils.touch(yaml_file)
184
- end
185
-
186
- File.open(yaml_file, "w") { |f| f.puts yaml.to_yaml }
187
- end
188
-
189
- def self.exit_on_failure?
190
- true
191
- end
192
-
193
- # Load the thorfiles. If relevant_to is supplied, looks for specific files
194
- # in the thor_root instead of loading them all.
195
- #
196
- # By default, it also traverses the current path until find Thor files, as
197
- # described in thorfiles. This look up can be skipped by suppliying
198
- # skip_lookup true.
199
- #
200
- def initialize_thorfiles(relevant_to=nil, skip_lookup=false)
201
- thorfiles(relevant_to, skip_lookup).each do |f|
202
- Thor::Util.load_thorfile(f, nil, options[:debug]) unless Thor::Base.subclass_files.keys.include?(File.expand_path(f))
203
- end
204
- end
205
-
206
- # Finds Thorfiles by traversing from your current directory down to the root
207
- # directory of your system. If at any time we find a Thor file, we stop.
208
- #
209
- # We also ensure that system-wide Thorfiles are loaded first, so local
210
- # Thorfiles can override them.
211
- #
212
- # ==== Example
213
- #
214
- # If we start at /Users/wycats/dev/thor ...
215
- #
216
- # 1. /Users/wycats/dev/thor
217
- # 2. /Users/wycats/dev
218
- # 3. /Users/wycats <-- we find a Thorfile here, so we stop
219
- #
220
- # Suppose we start at c:\Documents and Settings\james\dev\thor ...
221
- #
222
- # 1. c:\Documents and Settings\james\dev\thor
223
- # 2. c:\Documents and Settings\james\dev
224
- # 3. c:\Documents and Settings\james
225
- # 4. c:\Documents and Settings
226
- # 5. c:\ <-- no Thorfiles found!
227
- #
228
- def thorfiles(relevant_to=nil, skip_lookup=false)
229
- thorfiles = []
230
-
231
- unless skip_lookup
232
- Pathname.pwd.ascend do |path|
233
- thorfiles = Thor::Util.globs_for(path).map { |g| Dir[g] }.flatten
234
- break unless thorfiles.empty?
235
- end
236
- end
237
-
238
- files = (relevant_to ? thorfiles_relevant_to(relevant_to) : Thor::Util.thor_root_glob)
239
- files += thorfiles
240
- files -= ["#{thor_root}/thor.yml"]
241
-
242
- files.map! do |file|
243
- File.directory?(file) ? File.join(file, "main.thor") : file
244
- end
245
- end
246
-
247
- # Load thorfiles relevant to the given method. If you provide "foo:bar" it
248
- # will load all thor files in the thor.yaml that has "foo" e "foo:bar"
249
- # namespaces registered.
250
- #
251
- def thorfiles_relevant_to(meth)
252
- lookup = [ meth, meth.split(":")[0...-1].join(":") ]
253
-
254
- files = thor_yaml.select do |k, v|
255
- v[:namespaces] && !(v[:namespaces] & lookup).empty?
256
- end
257
-
258
- files.map { |k, v| File.join(thor_root, "#{v[:filename]}") }
259
- end
260
-
261
- # Display information about the given klasses. If with_module is given,
262
- # it shows a table with information extracted from the yaml file.
263
- #
264
- def display_klasses(with_modules=false, show_internal=false, klasses=Thor::Base.subclasses)
265
- klasses -= [Thor, Thor::Runner, Thor::Group] unless show_internal
266
-
267
- raise Error, "No Thor tasks available" if klasses.empty?
268
- show_modules if with_modules && !thor_yaml.empty?
269
-
270
- list = Hash.new { |h,k| h[k] = [] }
271
- groups = klasses.select { |k| k.ancestors.include?(Thor::Group) }
272
-
273
- # Get classes which inherit from Thor
274
- (klasses - groups).each { |k| list[k.namespace.split(":").first] += k.printable_tasks(false) }
275
-
276
- # Get classes which inherit from Thor::Base
277
- groups.map! { |k| k.printable_tasks(false).first }
278
- list["root"] = groups
279
-
280
- # Order namespaces with default coming first
281
- list = list.sort{ |a,b| a[0].sub(/^default/, '') <=> b[0].sub(/^default/, '') }
282
- list.each { |n, tasks| display_tasks(n, tasks) unless tasks.empty? }
283
- end
284
-
285
- def display_tasks(namespace, list) #:nodoc:
286
- list.sort!{ |a,b| a[0] <=> b[0] }
287
-
288
- say shell.set_color(namespace, :blue, true)
289
- say "-" * namespace.size
290
-
291
- print_table(list, :truncate => true)
292
- say
293
- end
294
-
295
- def show_modules #:nodoc:
296
- info = []
297
- labels = ["Modules", "Namespaces"]
298
-
299
- info << labels
300
- info << [ "-" * labels[0].size, "-" * labels[1].size ]
301
-
302
- thor_yaml.each do |name, hash|
303
- info << [ name, hash[:namespaces].join(", ") ]
304
- end
305
-
306
- print_table info
307
- say ""
308
- end
309
- end
@@ -1,7 +0,0 @@
1
- if defined?(Thor)
2
- Bundler.ui.warn "Thor has already been required. " +
3
- "This may cause Bundler to malfunction in unexpected ways."
4
- end
5
- $:.unshift File.expand_path('../vendor', __FILE__)
6
- require 'thor'
7
- require 'thor/actions'