Skip to content

Commit 975fc12

Browse files
SethTisueSethTisue
committed
Merge pull request #373 from SethTisue/add-gemfile-try-2
for local use, recommend Bundler and provide config
2 parents 8134b48 + fcff4ce commit 975fc12

File tree

7 files changed

+181
-10
lines changed

7 files changed

+181
-10
lines changed

‎.bundle/config

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
---
2+
BUNDLE_PATH: vendor/bundle
3+
BUNDLE_DISABLE_SHARED_GEMS: '1'

‎.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
_site/
2-
.DS_Store
2+
.DS_Store
3+
/vendor/bundle/
4+
/.jekyll-metadata

‎Gemfile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
source 'https://rubygems.org'
2+
gem 'jekyll', '1.5.1'
3+
gem 'json', '1.8.3'
4+
gem 'kramdown', '1.8.0'
5+
gem 'mercenary', '0.3.5'
6+
gem 'posix-spawn', '0.3.11'
7+
gem 'yajl-ruby', '1.2.1'

‎Gemfile.lock

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
GEM
2+
remote: https://rubygems.org/
3+
specs:
4+
blankslate (2.1.2.4)
5+
classifier (1.3.4)
6+
fast-stemmer (>= 1.0.0)
7+
colorator (0.1)
8+
commander (4.1.6)
9+
highline (~> 1.6.11)
10+
fast-stemmer (1.0.2)
11+
ffi (1.9.10)
12+
highline (1.6.21)
13+
jekyll (1.5.1)
14+
classifier (~> 1.3)
15+
colorator (~> 0.1)
16+
commander (~> 4.1.3)
17+
liquid (~> 2.5.5)
18+
listen (~> 1.3)
19+
maruku (= 0.7.0)
20+
pygments.rb (~> 0.5.0)
21+
redcarpet (~> 2.3.0)
22+
safe_yaml (~> 1.0)
23+
toml (~> 0.1.0)
24+
json (1.8.3)
25+
kramdown (1.8.0)
26+
liquid (2.5.5)
27+
listen (1.3.1)
28+
rb-fsevent (>= 0.9.3)
29+
rb-inotify (>= 0.9)
30+
rb-kqueue (>= 0.2)
31+
maruku (0.7.0)
32+
mercenary (0.3.5)
33+
parslet (1.5.0)
34+
blankslate (~> 2.0)
35+
posix-spawn (0.3.11)
36+
pygments.rb (0.5.4)
37+
rb-fsevent (0.9.5)
38+
rb-inotify (0.9.5)
39+
ffi (>= 0.5.0)
40+
rb-kqueue (0.2.4)
41+
ffi (>= 0.5.0)
42+
redcarpet (2.3.0)
43+
safe_yaml (1.0.4)
44+
toml (0.1.2)
45+
parslet (~> 1.5.0)
46+
yajl-ruby (1.2.1)
47+
48+
PLATFORMS
49+
ruby
50+
51+
DEPENDENCIES
52+
jekyll (= 1.5.1)
53+
json (= 1.8.3)
54+
kramdown (= 1.8.0)
55+
mercenary (= 0.3.5)
56+
posix-spawn (= 0.3.11)
57+
yajl-ruby (= 1.2.1)
58+
59+
BUNDLED WITH
60+
1.10.6

‎README.md

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,35 @@ It's a static site generated by [Jekyll](https://github.com/mojombo/jekyll), and
66

77
## Dependencies
88

9-
You'll need Jekyll installed to generate and test the site. To get it, most people can install via RubyGems:
9+
This site uses a Jekyll, a Ruby framework. You'll need Ruby and Bundler installed; see [Jekyll installation instructions](http://jekyllrb.com/docs/installation/) for the details.
1010

11-
gem install jekyll
11+
## Building & Viewing
1212

13-
OSX users might have to update RubyGems:
13+
cd into the directory where you cloned this repository, then install the required gems with `bundle install`. This will automatically put the gems into `./vendor/bundle`.
1414

15-
sudo gem update --system
15+
Start the server in the context of the bundle:
1616

17-
If in doubt, head over to the [Jekyll wiki](https://github.com/mojombo/jekyll/wiki) for installation instructions.
17+
bundle exec jekyll serve
1818

19-
## Building
19+
and watch the output. You should see something like:
2020

21-
After cloning, cd into the `scala/scala-lang` directory and run:
21+
Configuration file: /Users/ben/src/scala.github.com/_config.yml
22+
Source: /Users/ben/src/scala.github.com
23+
Destination: /Users/ben/src/scala.github.com/_site
24+
Incremental build: enabled
25+
Generating... done.
26+
Auto-regeneration: enabled for '/Users/ben/src/scala-lang'
2227

23-
jekyll serve
28+
The generated site is available at `http://localhost:4000`.
2429

25-
To see the generated site, just visit `http://localhost:4000`.
30+
Jekyll will automatically watch for changes on the filesystem. When you change a file, the console will show that jekyll is regenerating. Wait until it says `done` to refresh your browser.
31+
32+
### Windows and UTF-8
33+
34+
If you get `incompatible encoding` errors when generating the site under Windows, then ensure that the
35+
console in which you are running jekyll can work with UTF-8 characters. As described in the blog
36+
[Solving UTF problem with Jekyll on Windows](http://joseoncode.com/2011/11/27/solving-utf-problem-with-jekyll-on-windows/)
37+
you have to execute `chcp 65001`. This command is best added to the `jekyll.bat`-script.
2638

2739
## YAML Front Matter
2840

‎_config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@ title: The Scala Programming Language
22

33
scalaversion: "2.11.7"
44
devscalaversion: "2.12.0-M3"
5+
56
baseurl: ""
67
markdown: kramdown

‎_data/languages.yml

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
ar:
2+
name: "العربية"
3+
4+
bn:
5+
name: "বাংলা"
6+
7+
ca:
8+
name: "Català"
9+
10+
cs:
11+
name: "Čeština"
12+
13+
de:
14+
name: "Deutsch"
15+
16+
en:
17+
name: "English"
18+
19+
es:
20+
name: "Español"
21+
22+
fa:
23+
name: "فارسی"
24+
25+
fi:
26+
name: "Suomi"
27+
28+
fr:
29+
name: "Français"
30+
31+
he:
32+
name: "עברית"
33+
34+
hi:
35+
name: "हिन्दी"
36+
37+
hu:
38+
name: "Magyar"
39+
40+
id:
41+
name: "Bahasa Indonesia"
42+
43+
it:
44+
name: "Italiano"
45+
46+
ja:
47+
name: "日本語"
48+
49+
ko:
50+
name: "한국어"
51+
52+
nl:
53+
name: "Nederlands"
54+
55+
no:
56+
name: "Norsk (Bokmål)"
57+
58+
pl:
59+
name: "Polski"
60+
61+
pt:
62+
name: "Português"
63+
64+
"pt-br":
65+
name: "Português (Brasil)"
66+
67+
ru:
68+
name: "Русский"
69+
70+
sv:
71+
name: "Svenska"
72+
73+
tr:
74+
name: "Türkçe"
75+
76+
vi:
77+
name: "Tiếng Việt"
78+
79+
uk:
80+
name: "Українська"
81+
82+
"zh-cn":
83+
name: "中文 (简体)"
84+
85+
"zh-tw":
86+
name: "中文 (繁體)"

0 commit comments

Comments
 (0)