Merge pull request #55 from marocchino/korean

Merge master

.gitignore

@@ -23,5 +23,10 @@
 # Bundler binstubs
 /bin
 
+# pages from the bundler repo
 source/issues.md
-source/conduct.md
+source/conduct.md
+
+# man pages built from the bundler repo
+/source/man/
+/source/v*/man/

Rakefile

@@ -14,7 +14,7 @@ task :update_vendor => ["vendor/bundler"] do
   Dir.chdir("vendor/bundler") { sh "git fetch --all" }
 end
 
-VERSIONS = %w(v1.0 v1.1 v1.2 v1.3 v1.5 v1.6 v1.7 v1.8 v1.9 v1.10).freeze
+VERSIONS = %w(v1.0 v1.1 v1.2 v1.3 v1.5 v1.6 v1.7 v1.8 v1.9 v1.10 v1.11).freeze
 desc "Print the Bundler versions the site documents"
 task :versions do
   puts VERSIONS.join(' ')
@@ -25,19 +25,21 @@ task :man => [:update_vendor] do
   VERSIONS.each do |version|
     branch = (version[1..-1].split('.') + %w(stable)).join('-')
 
-    mkdir_p "build/#{version}/man"
+    rm_rf "source/#{version}/man"
+    mkdir_p "source/#{version}/man"
 
     Dir.chdir "vendor/bundler" do
       sh "git reset --hard HEAD"
       sh "git checkout origin/#{branch}"
       sh "ronn -5 man/*.ronn"
-      cp(FileList["man/*.html"], "../../build/#{version}/man")
+      cp(FileList["man/*.html"], "../../source/#{version}/man")
       sh "git clean -fd"
     end
   end
 
   # Make man pages for the latest version available at the top level, too.
-  cp_r "build/#{VERSIONS.last}/man", "build"
+  rm_rf "source/man"
+  cp_r "source/#{VERSIONS.last}/man", "source"
 end
 
 desc "Pulls in pages maintained in the bundler repo."
@@ -63,12 +65,12 @@ task :update_site => ["vendor/bundler.github.io"] do
 end
 
 desc "Build the static site"
-task :build => [:repo_pages] do
+task :build => [:repo_pages, :man] do
   sh "middleman build --clean"
 end
 
 desc "Release the current commit to ruby-korea/bundler-site@gh-pages"
-task :release => [:update_vendor, :build, :man, :repo_pages] do
+task :release => [:build, :update_site] do
   commit = `git rev-parse HEAD`.chomp
 
   Dir.chdir "vendor/bundler" do

app.json

@@ -0,0 +1,16 @@
+{
+  "name": "bundler-site",
+  "scripts": {
+  },
+  "env": {
+    "LANG": {
+      "required": true
+    },
+    "RACK_ENV": {
+      "required": true
+    }
+  },
+  "addons": [
+
+  ]
+}

bin/rake

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rake' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rake', 'rake')

source/blog/2015-12-12-version-1-11-released.md

@@ -0,0 +1,75 @@
+---
+title: Version 1.11 released
+date: 2015-12-12 19:00 UTC
+tags:
+author: Samuel Giddins
+author_url: http://segiddins.me
+category: release
+---
+
+Bundler 1.11 is here! Six and a half months after the last big release, we're
+finally ready to ship 1.11.
+
+I know it's been a while, but there's a pretty good reason for that. Over the
+summer, the team was busy supervising _four_ Google Summer of Code students:
+
+ - We made a significant amount of progress on the new compact gem index, which
+   ought to ship in 1.12 in the near future.
+ - We improved the Bundler website and online documentation.
+ - We've created a solid base for Bundler 2.0.
+ - We prototyped a new plugin system.
+
+In addition, the Bundler Core team has spent a lot of time focusing on the
+development experience of bundler itself. The bundler codebase is over five
+years old, and contains code from over 400 contributors. That can make it
+rather daunting to start contributing, and also makes it hard to ensure that
+all of the code in bundler is up to the same standards (and is fit to last for
+the next five years!). In order to make things more consistent, we've
+introduced RuboCop (and thus a style guide), we've instituted a build bot to
+ensure that `master` is never failing, and have decided to subject 100% of the
+new code introduced to code review. This is a big step forward, and lets me
+confidently say that this will be our best release yet!
+
+That out of the way, what's actually in this long-awaited release?
+
+### New features
+
+First up, we've combed through a few years worth of bundler issues, and have
+improved the error messaging for every single one of them. Our goal is to never
+show an exception with a backtrace, and instead present a friendly and helpful
+error message when things go awry -- and we're now pretty close to that.
+
+The dependency resolver has also seen a few updates. Continuing the theme of
+improved errors, version conflicts will now do a better job of reporting what
+versions of every gem have been activated, making it even easier to figure out
+the best way to resolve said conflict. Additionally, resolution has been sped up
+by over 25x in pathological cases. That's a pretty nice win.
+
+Finally, we've laid the groundwork for resolving gems based on the current
+version of Ruby.  Once the new index is rolled out, Bundler will make sure to
+choose gems whose `required_ruby_version` matches the Ruby you are running on.
+
+### Bugfixes
+
+The real meat of this release comes in the bugfix section, however. Across
+almost four hundred commits, we've squashed upwards of fifty unique bugs.
+Meaning this version of bundler should be the fastest, most stable version we've
+ever released.
+
+### What's Next
+
+As I mentioned earlier, this long gap between releases doesn't mean we're
+slowing down development -- quite the opposite, in fact! We're actively working
+on bundler 1.12 and 2.0 _at this very moment_, and are incredibly exited to get
+the new index into people's hands as fast as we possibly can.
+
+#### Updating
+
+To install the last release of Bundler, you can run:
+
+```
+$ [sudo] gem install bundler
+```
+
+For all the details, don’t miss the
+[Changelog](https://github.com/bundler/bundler/blob/v1.11.0/CHANGELOG.md#1110-2015-12-12)!

source/shared/_whats_new.haml

@@ -1,6 +1,7 @@
 %h1 What's New in each Release
 .buttons
-  = link_to 'v1.10', '/v1.10/whats_new.html'
+  = link_to 'v1.11', '/v1.11/whats_new.html'
+  = link_to 'v1.10', '/v1.10/whats_new.html#version110'
   = link_to 'v1.9', '/v1.9/whats_new.html#version19'
   = link_to 'v1.8', '/v1.8/whats_new.html#version18'
   = link_to 'v1.7', '/v1.7/whats_new.html#version17'

source/v1.0/gemfile.haml

@@ -39,7 +39,7 @@
       <code>~> 2.0.3</code> is identical to <code>>= 2.0.3</code> and <code>< 2.1</code>.
       <code>~> 2.1</code> is identical to <code>>= 2.1</code> and <code>< 3.0</code>.
       <code>~> 2.2.beta</code> will match prerelease versions like <code>2.2.beta.12</code>.
-    = link_to("RubyGems version specifiers", "http://guides.rubygems.org/patterns/#pessimistic_version_constraint")
+    = link_to("RubyGems version specifiers", "http://guides.rubygems.org/patterns/#pessimistic-version-constraint")
 
   .bullet
     .description

source/v1.1/gemfile.haml

@@ -39,7 +39,7 @@
       <code>~> 2.0.3</code> is identical to <code>>= 2.0.3</code> and <code>< 2.1</code>.
       <code>~> 2.1</code> is identical to <code>>= 2.1</code> and <code>< 3.0</code>.
       <code>~> 2.2.beta</code> will match prerelease versions like <code>2.2.beta.12</code>.
-    = link_to 'RubyGems version specifiers', 'http://guides.rubygems.org/patterns/#pessimistic_version_constraint'
+    = link_to 'RubyGems version specifiers', 'http://guides.rubygems.org/patterns/#pessimistic-version-constraint'
 
   .bullet
     .description

source/v1.10/gemfile.haml

@@ -58,7 +58,7 @@
       사용한 것과 같습니다. <code>~> 2.1</code>은 <code>>= 2.1</code>과
       <code>< 3.0</code>을 함께 사용한 것과 같습니다. <code>~> 2.2.beta</code>는
       <code>2.2.beta.12</code>같은 사전 릴리스 버전과 일치합니다.
-    = link_to '루비젬스 버전 지정자', 'http://guides.rubygems.org/patterns/#pessimistic_version_constraint'
+    = link_to '루비젬스 버전 지정자', 'http://guides.rubygems.org/patterns/#pessimistic-version-constraint'
 
   .bullet
     .description

source/v1.11/bundle_binstubs.haml

@@ -0,0 +1,18 @@
+%h2 bundle binstubs
+
+.contents
+  .bullet
+    .description
+      나열된 gem의 binstubs를 설치
+    :code
+      $ bundle binstubs [GEM] [--force] [--path=PATH]
+    .notes
+      %p
+        옵션:
+      %p
+        <code>--force</code>: 이미 binstubs가 있다면 덮어쓰기
+      %p
+        <code>--path</code>: Binstub을 놓을 디렉터리 (bin이 기본 값)
+    .description
+      [GEM] 안의 실행파일의 binstubs를 생성합니다. Binstubs는 bin 안에 들어가거나,
+      \--path 가 지정되어 있으면 지정한 binstubs 디렉터리에 들어갑니다.

source/v1.11/bundle_check.haml

@@ -0,0 +1,23 @@
+%h2 bundle check
+
+.contents
+  .bullet
+    .description
+      현재 설치된 gem이 Gemfile의 의존성을 만족하는지 확인합니다.
+    :code
+      $ bundle check [--dry-run] [--gemfile=FILE] [--path=PATH]
+    .notes
+      %p
+        옵션:
+      %p
+        <code>--dry-run</code>: Gemfile을 고정합니다.
+      %p
+        <code>--gemfile</code>: Gemfile 대신 특정 gemfile을 사용합니다.
+      %p
+        <code>--path</code>: 시스템 기본 값($BUNDLE_PATH 이나 $GEM_HOME) 대신
+        다른 경로를 지정합니다. 번들러는 이 값을 기억했다가 다음 설치에서도
+        사용합니다.
+    .description
+      check는 Gemfile에서 요청한 gem을 로컬 기기에서 찾습니다. 모든 gem이 있다면
+      번들러는 성공 메시지를 출력하고 상태 코드 0으로 종료합니다. 없다면 가장
+      처음에 없는 gem이 나열되며 상태 코드 1로 종료합니다.

source/v1.11/bundle_clean.haml

@@ -0,0 +1,16 @@
+%h2 bundle clean
+
+.contents
+  .bullet
+    .description
+      번들러 디렉터리의 사용하지 않는 gem을 청소합니다.
+    :code
+      $ bundle clean [--dry-run] [--force]
+    .notes
+      %p
+        옵션:
+      %p
+        <code>--dry-run</code>: 변경을 출력하기만 하고, 실제로 gem을 청소하지는
+        않습니다.
+      %p
+        <code>--force</code>: --path가 설정되어 있어도 강제로 청소합니다.