Permalink
Browse files

Merge branch 'master' of github.com:rubygems/gemcutter

  • Loading branch information...
2 parents 923a6e6 + 50bcc0f commit 7f1e556920305f5a96d056ddeb98e5328075941f Tom Copeland committed Feb 1, 2011
Showing with 118 additions and 68 deletions.
  1. +3 −3 Gemfile
  2. +51 −51 Gemfile.lock
  3. +12 −2 app/views/layouts/application.html.erb
  4. +1 −1 app/views/profiles/show.html.erb
  5. +1 −1 config/application.rb
  6. +10 −0 config/initializers/action_mailer.rb
  7. +1 −1 config/routes.rb
  8. +1 −0 features/profile.feature
  9. +32 −0 lib/tasks/gemcutter.rake
  10. BIN public/images/dnsimple.png
  11. +6 −9 public/stylesheets/screen.css
  12. BIN vendor/cache/actionmailer-3.0.0.gem
  13. BIN vendor/cache/actionmailer-3.0.3.gem
  14. BIN vendor/cache/actionpack-3.0.0.gem
  15. BIN vendor/cache/actionpack-3.0.3.gem
  16. BIN vendor/cache/activemodel-3.0.0.gem
  17. BIN vendor/cache/activemodel-3.0.3.gem
  18. BIN vendor/cache/activerecord-3.0.0.gem
  19. BIN vendor/cache/activerecord-3.0.3.gem
  20. BIN vendor/cache/activeresource-3.0.0.gem
  21. BIN vendor/cache/activeresource-3.0.3.gem
  22. BIN vendor/cache/activesupport-3.0.0.gem
  23. BIN vendor/cache/activesupport-3.0.3.gem
  24. BIN vendor/cache/addressable-2.2.0.gem
  25. BIN vendor/cache/addressable-2.2.3.gem
  26. BIN vendor/cache/arel-1.0.1.gem
  27. BIN vendor/cache/arel-2.0.7.gem
  28. BIN vendor/cache/configuration-1.1.0.gem
  29. BIN vendor/cache/configuration-1.2.0.gem
  30. BIN vendor/cache/excon-0.2.8.gem
  31. BIN vendor/cache/excon-0.4.0.gem
  32. BIN vendor/cache/factory_girl-1.3.2.gem
  33. BIN vendor/cache/factory_girl-1.3.3.gem
  34. BIN vendor/cache/i18n-0.4.1.gem
  35. BIN vendor/cache/i18n-0.5.0.gem
  36. BIN vendor/cache/mail-2.2.15.gem
  37. BIN vendor/cache/mail-2.2.5.gem
  38. BIN vendor/cache/net-ssh-2.0.23.gem
  39. BIN vendor/cache/net-ssh-2.0.24.gem
  40. BIN vendor/cache/rack-test-0.5.4.gem
  41. BIN vendor/cache/rack-test-0.5.7.gem
  42. BIN vendor/cache/{rails-3.0.0.gem → rails-3.0.3.gem}
  43. BIN vendor/cache/railties-3.0.0.gem
  44. BIN vendor/cache/railties-3.0.3.gem
  45. BIN vendor/cache/thor-0.14.0.gem
  46. BIN vendor/cache/thor-0.14.6.gem
  47. BIN vendor/cache/treetop-1.4.5.gem
  48. BIN vendor/cache/treetop-1.4.9.gem
  49. BIN vendor/cache/tzinfo-0.3.23.gem
  50. BIN vendor/cache/tzinfo-0.3.24.gem
View
@@ -1,6 +1,7 @@
source :rubygems
-gem "rails", "3.0.0"
+gem "rails", "3.0.3"
gem "rack", "1.2.1"
+gem "mail", "2.2.15"
gem "clearance", "0.9.0.rc9"
gem "fog", "0.3.25"
@@ -36,12 +37,11 @@ group :test do
gem "fakeweb", "1.2.6"
gem "launchy", "0.3.7"
gem "nokogiri", "1.4.3.1"
- gem "rack-test", "0.5.4", :require => "rack/test"
+ gem "rack-test", "0.5.7", :require => "rack/test"
gem "redgreen", "1.2.2"
gem "rr", "0.10.11"
gem "shoulda", "2.11.1"
gem "timecop", "0.3.5"
- gem "treetop", "1.4.5"
gem "webrat", "0.5.3"
gem "webmock", "0.7.3"
end
View
@@ -2,39 +2,38 @@ GEM
remote: http://rubygems.org/
specs:
abstract (1.0.0)
- actionmailer (3.0.0)
- actionpack (= 3.0.0)
- mail (~> 2.2.5)
- actionpack (3.0.0)
- activemodel (= 3.0.0)
- activesupport (= 3.0.0)
+ actionmailer (3.0.3)
+ actionpack (= 3.0.3)
+ mail (~> 2.2.9)
+ actionpack (3.0.3)
+ activemodel (= 3.0.3)
+ activesupport (= 3.0.3)
builder (~> 2.1.2)
erubis (~> 2.6.6)
- i18n (~> 0.4.1)
+ i18n (~> 0.4)
rack (~> 1.2.1)
- rack-mount (~> 0.6.12)
- rack-test (~> 0.5.4)
+ rack-mount (~> 0.6.13)
+ rack-test (~> 0.5.6)
tzinfo (~> 0.3.23)
- activemodel (3.0.0)
- activesupport (= 3.0.0)
+ activemodel (3.0.3)
+ activesupport (= 3.0.3)
builder (~> 2.1.2)
- i18n (~> 0.4.1)
- activerecord (3.0.0)
- activemodel (= 3.0.0)
- activesupport (= 3.0.0)
- arel (~> 1.0.0)
+ i18n (~> 0.4)
+ activerecord (3.0.3)
+ activemodel (= 3.0.3)
+ activesupport (= 3.0.3)
+ arel (~> 2.0.2)
tzinfo (~> 0.3.23)
- activeresource (3.0.0)
- activemodel (= 3.0.0)
- activesupport (= 3.0.0)
- activesupport (3.0.0)
- addressable (2.2.0)
- arel (1.0.1)
- activesupport (~> 3.0.0)
+ activeresource (3.0.3)
+ activemodel (= 3.0.3)
+ activesupport (= 3.0.3)
+ activesupport (3.0.3)
+ addressable (2.2.3)
+ arel (2.0.7)
builder (2.1.2)
clearance (0.9.0.rc9)
rails (~> 3.0.0)
- configuration (1.1.0)
+ configuration (1.2.0)
cucumber (0.8.5)
builder (~> 2.1.2)
diff-lcs (~> 1.1.2)
@@ -51,8 +50,8 @@ GEM
diff-lcs (1.1.2)
erubis (2.6.6)
abstract (>= 1.0.0)
- excon (0.2.8)
- factory_girl (1.3.2)
+ excon (0.4.0)
+ factory_girl (1.3.3)
factory_girl_rails (1.0)
factory_girl (~> 1.3)
rails (>= 3.0.0.beta4)
@@ -74,18 +73,19 @@ GEM
high_voltage (0.9.1)
hoptoad_notifier (2.2.0)
activesupport
- i18n (0.4.1)
+ i18n (0.5.0)
json (1.2.0)
json_pure (1.4.6)
launchy (0.3.7)
configuration (>= 0.0.5)
rake (>= 0.8.1)
- mail (2.2.5)
+ mail (2.2.15)
activesupport (>= 2.3.6)
- mime-types
- treetop (>= 1.4.5)
+ i18n (>= 0.4.0)
+ mime-types (~> 1.16)
+ treetop (~> 1.4.8)
mime-types (1.16)
- net-ssh (2.0.23)
+ net-ssh (2.0.24)
newrelic_rpm (2.13.0.beta6)
nokogiri (1.4.3.1)
paul_revere (0.1.5)
@@ -97,21 +97,21 @@ GEM
rack (>= 1.0)
rack-mount (0.6.13)
rack (>= 1.0.0)
- rack-test (0.5.4)
+ rack-test (0.5.7)
rack (>= 1.0)
- rails (3.0.0)
- actionmailer (= 3.0.0)
- actionpack (= 3.0.0)
- activerecord (= 3.0.0)
- activeresource (= 3.0.0)
- activesupport (= 3.0.0)
- bundler (~> 1.0.0)
- railties (= 3.0.0)
- railties (3.0.0)
- actionpack (= 3.0.0)
- activesupport (= 3.0.0)
- rake (>= 0.8.4)
- thor (~> 0.14.0)
+ rails (3.0.3)
+ actionmailer (= 3.0.3)
+ actionpack (= 3.0.3)
+ activerecord (= 3.0.3)
+ activeresource (= 3.0.3)
+ activesupport (= 3.0.3)
+ bundler (~> 1.0)
+ railties (= 3.0.3)
+ railties (3.0.3)
+ actionpack (= 3.0.3)
+ activesupport (= 3.0.3)
+ rake (>= 0.8.7)
+ thor (~> 0.14.4)
rake (0.8.7)
redgreen (1.2.2)
redis (2.0.1)
@@ -123,12 +123,12 @@ GEM
rack (>= 1.0)
system_timer (1.0)
term-ansicolor (1.0.5)
- thor (0.14.0)
+ thor (0.14.6)
timecop (0.3.5)
- treetop (1.4.5)
+ treetop (1.4.9)
polyglot (>= 0.3.1)
trollop (1.16.2)
- tzinfo (0.3.23)
+ tzinfo (0.3.24)
validates_url_format_of (0.1.0)
activerecord (>= 2.3.4)
webmock (0.7.3)
@@ -156,14 +156,15 @@ DEPENDENCIES
hoptoad_notifier (= 2.2.0)
json (= 1.2.0)
launchy (= 0.3.7)
+ mail (= 2.2.15)
newrelic_rpm (= 2.13.0.beta6)
nokogiri (= 1.4.3.1)
paul_revere (= 0.1.5)
pg (= 0.8.0)
rack (= 1.2.1)
rack-maintenance (= 0.3.0)
- rack-test (= 0.5.4)
- rails (= 3.0.0)
+ rack-test (= 0.5.7)
+ rails (= 3.0.3)
redgreen (= 1.2.2)
redis (= 2.0.1)
rest-client (= 1.0.3)
@@ -172,7 +173,6 @@ DEPENDENCIES
sinatra (= 1.0)
system_timer (= 1.0)
timecop (= 0.3.5)
- treetop (= 1.4.5)
validates_url_format_of (= 0.1.0)
webmock (= 0.7.3)
webrat (= 0.5.3)
@@ -90,8 +90,18 @@
<%= link_to "Code", "http://github.com/rubygems/gemcutter" %>
<%= link_to "Discuss", "http://groups.google.com/group/gemcutter" %>
<%= link_to "Stats", stats_url %>
- <%= link_to "designed by #{image_tag('thoughtbot.png')}".html_safe, "http://thoughtbot.com", :title => "Designed by Thoughtbot", :id => "thoughtbot" %>
- <%= link_to "supported by #{image_tag('rubycentral.png')}".html_safe, "http://rubycentral.org", :title => "Supported by Ruby Central", :id => "rubycentral" %>
+ <%= link_to "designed by #{image_tag('thoughtbot.png')}".html_safe, "http://thoughtbot.com",
+ :class => "sponsor",
+ :title => "Designed by Thoughtbot",
+ :id => "thoughtbot" %>
+ <%= link_to "resolved with #{image_tag('dnsimple.png')}".html_safe, "http://dnsimple.com",
+ :title => "Resolved with DNSimple",
+ :class => "sponsor",
+ :id => "dnsimple" %>
+ <%= link_to "supported by #{image_tag('rubycentral.png')}".html_safe, "http://rubycentral.org",
+ :title => "Supported by Ruby Central",
+ :class => "sponsor",
+ :id => "rubycentral" %>
</div>
</div>
</div>
@@ -4,7 +4,7 @@
</div>
<div id="profile-info">
<h2 id="profile-name"><%= link_to @user.display_handle, profile_path(@user.display_id) %></h2>
- <h3 id="profile-email"><%= link_to @user.email, "mailto:#{@user.email}" %></h3>
+ <h3 id="profile-email"><%= mail_to @user.email, "(email)", :encode => "hex" %></h3>
</div>
<div id="downloads-ego">
<% if @user == current_user %>
View
@@ -13,7 +13,7 @@
$rubygems_config = YAML.load_file("config/rubygems.yml")[Rails.env].symbolize_keys
HOST = $rubygems_config[:host]
-RUBYGEMS_VERSION = "1.4.1"
+RUBYGEMS_VERSION = "1.5.0"
module Gemcutter
class Application < Rails::Application
@@ -0,0 +1,10 @@
+if Rails.configuration.action_mailer.delivery_method == :smtp
+ ActionMailer::Base.smtp_settings = {
+ :address => "smtp.sendgrid.net",
+ :port => "25",
+ :authentication => :plain,
+ :user_name => ENV['SENDGRID_USERNAME'],
+ :password => ENV['SENDGRID_PASSWORD'],
+ :domain => ENV['SENDGRID_DOMAIN']
+ }
+end
View
@@ -63,8 +63,8 @@
resource :search, :only => :show
resource :dashboard, :only => :show
- resource :profile, :only => [:edit, :update]
resources :profiles, :only => :show
+ resource :profile, :only => [:edit, :update]
resources :stats, :only => :index
resources :rubygems, :only => :index, :path => "gems" do
View
@@ -12,6 +12,7 @@ Feature: Profile Feature
And the "sandworm" rubygem is owned by "jon@example.com"
When I am on "jon@example.com" profile page
Then I should see "sandworm"
+ And I should not see "jon@example.com"
Scenario: Show todays downloads for my gems in my profile
Given I have signed in with "jon@example.com/password"
View
@@ -179,4 +179,36 @@ namespace :gemcutter do
Pusher.indexer.update_index(source_index)
end
end
+
+ namespace :rubygems do
+ desc "update rubygems. run as: rake gemcutter:rubygems:update VERSION=[version number] RAILS_ENV=[staging|production] S3_KEY=[key] S3_SECRET=[secret]"
+ task :update => :environment do
+ version = ENV["VERSION"]
+ app_path = Rails.root.join("config", "application.rb")
+ old_content = app_path.read
+ new_content = old_content.gsub(/RUBYGEMS_VERSION = "(.*)"/, %{RUBYGEMS_VERSION = "#{version}"})
+
+ app_path.open("w") do |file|
+ file.write new_content
+ end
+
+ class Updater
+ include Vault
+ end
+
+ updater = Updater.new
+ html = Nokogiri.parse(open("http://rubyforge.org/frs/?group_id=126"))
+ links = html.css("a[href*='#{version}']").map { |n| n["href"] }
+ links.each do |link|
+ url = "http://rubyforge.org#{link}"
+
+ puts "Uploading #{url}..."
+ updater.directory.files.create({
+ :body => open(url).read,
+ :key => "rubygems/#{File.basename(url)}",
+ :public => true
+ })
+ end
+ end
+ end
end
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -911,22 +911,19 @@ table {
margin-top: -15px;
}
-.footer .links #thoughtbot {
+.footer .links .sponsor {
float: right;
font-size: 0.9em;
margin-top: -25px;
+ margin-bottom: 20px;
+ margin-left: 10px;
}
-.footer .links #rubycentral {
- margin-top: -25px;
- font-size: 1em;
- float: right;
- margin-right: 25px;
- margin-bottom: 20px;
+.footer .links #dnsimple img {
+ margin-top: 13px;
}
-.footer .links #thoughtbot img,
-.footer .links #rubycentral img {
+.footer .links .sponsor img {
padding-top: 5px;
display: block;
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
Binary file not shown.
View
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit 7f1e556

Please sign in to comment.