Repository: zeppelin
Updated Branches:
  refs/heads/master 18e75a3aa -> 28b478d95


[ZEPPELIN-813] Update safe_yaml version 0.9.7 -> 1.0.4

### What is this PR for?
This PR will fix 
[ZEPPELIN-813](https://issues.apache.org/jira/browse/ZEPPELIN-813).
I'm not sure what environment exactly generate this errors. I saw the below 
error in OS X 10.11.3
and ruby 2.3.0.

```
$ bundle exec jekyll serve --watch
/Users/cyhsutw/.rbenv/versions/2.3.0/lib/ruby/gems/2.3.0/gems/commander-4.1.5/lib/commander/user_interaction.rb:328:
 warning: constant ::TimeoutError is deprecated
/Users/cyhsutw/.rbenv/versions/2.3.0/lib/ruby/gems/2.3.0/gems/commander-4.1.5/lib/commander/runner.rb:365:in
 `block in require_program': program version required 
(Commander::Runner::CommandError)
        from 
/Users/cyhsutw/.rbenv/versions/2.3.0/lib/ruby/gems/2.3.0/gems/commander-4.1.5/lib/commander/runner.rb:364:in
 `each'
        from 
/Users/cyhsutw/.rbenv/versions/2.3.0/lib/ruby/gems/2.3.0/gems/commander-4.1.5/lib/commander/runner.rb:364:in
 `require_program'
        from 
/Users/cyhsutw/.rbenv/versions/2.3.0/lib/ruby/gems/2.3.0/gems/commander-4.1.5/lib/commander/runner.rb:52:in
 `run!'
        from 
/Users/cyhsutw/.rbenv/versions/2.3.0/lib/ruby/gems/2.3.0/gems/commander-4.1.5/lib/commander/delegates.rb:7:in
 `run!'
        from 
/Users/cyhsutw/.rbenv/versions/2.3.0/lib/ruby/gems/2.3.0/gems/commander-4.1.5/lib/commander/import.rb:10:in
 `block in <top (required)>'
/Users/cyhsutw/.rbenv/versions/2.3.0/lib/ruby/gems/2.3.0/gems/safe_yaml-0.9.7/lib/safe_yaml/syck_node_monkeypatch.rb:42:in
 `<top (required)>': uninitialized constant Syck (NameError)
        from 
/Users/cyhsutw/.rbenv/versions/2.3.0/lib/ruby/gems/2.3.0/gems/safe_yaml-0.9.7/lib/safe_yaml.rb:200:in
 `require'
        from 
/Users/cyhsutw/.rbenv/versions/2.3.0/lib/ruby/gems/2.3.0/gems/safe_yaml-0.9.7/lib/safe_yaml.rb:200:in
 `<module:YAML>'
        from 
/Users/cyhsutw/.rbenv/versions/2.3.0/lib/ruby/gems/2.3.0/gems/safe_yaml-0.9.7/lib/safe_yaml.rb:132:in
 `<top (required)>'
        from 
/Users/cyhsutw/.rbenv/versions/2.3.0/lib/ruby/gems/2.3.0/gems/jekyll-1.3.0/lib/jekyll.rb:21:in
 `require'
        from 
/Users/cyhsutw/.rbenv/versions/2.3.0/lib/ruby/gems/2.3.0/gems/jekyll-1.3.0/lib/jekyll.rb:21:in
 `<top (required)>'
        from 
/Users/cyhsutw/.rbenv/versions/2.3.0/lib/ruby/gems/2.3.0/gems/jekyll-1.3.0/bin/jekyll:7:in
 `require'
        from 
/Users/cyhsutw/.rbenv/versions/2.3.0/lib/ruby/gems/2.3.0/gems/jekyll-1.3.0/bin/jekyll:7:in
 `<top (required)>'
        from /Users/cyhsutw/.rbenv/versions/2.3.0/bin/jekyll:23:in `load'
        from /Users/cyhsutw/.rbenv/versions/2.3.0/bin/jekyll:23:in `<main>'
```

Maybe this error will be gone with `bundle update`. But it would be better we 
set `safe_yaml` version for the other users. So I just updated `safe_yaml` 
version from `0.9.7` to `1.0.4` in `Gemfile.lock` manually. And confirmed that 
there are no compatibility issues with ruby version `2.3.0`(latest stable 
version), `2.2.1`, `2.1.1` and `2.0.0`(this version is no longer maintained by 
ruby).

I also updated `docs/README.md` since we need ruby version higher than `2.0.0` 
not `1.9.3`. Please see 
[here](https://help.github.com/articles/setting-up-your-github-pages-site-locally-with-jekyll/#requirements).

### What type of PR is it?
Bug Fix & Documentation

### What is the Jira issue?
[ZEPPELIN-813](https://issues.apache.org/jira/browse/ZEPPELIN-813)

### How should this be tested?

###### 1. Apply this patch

```
$ cd docs
$ bundle install
```
If you already installed dependencies before, you need

```
$ bundle update safe_yaml
```

###### 2. Check what version of `safe_yaml` is installed -> `1.0.4` should be 
installed. Then

```
$ bundle exec jekyll serve --watch
```
It should be run with no issues.

### Questions:
* Does the licenses files need update? no
* Is there breaking changes for older versions? no
* Does this needs documentation? no

Author: AhyoungRyu <[email protected]>

Closes #1167 from AhyoungRyu/ZEPPELIN-813 and squashes the following commits:

458957d [AhyoungRyu] Add a newline
9cf8b42 [AhyoungRyu] Update docs/README.md
a2fd980 [AhyoungRyu] Update safe_yaml version 0.9.7 -> 1.0.4


Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/28b478d9
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/28b478d9
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/28b478d9

Branch: refs/heads/master
Commit: 28b478d9553f4327c71d2620c923e42c9e65a84a
Parents: 18e75a3
Author: AhyoungRyu <[email protected]>
Authored: Tue Jul 12 17:58:02 2016 +0900
Committer: Mina Lee <[email protected]>
Committed: Thu Jul 21 11:01:44 2016 +0900

----------------------------------------------------------------------
 docs/Gemfile.lock | 4 ++--
 docs/README.md    | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zeppelin/blob/28b478d9/docs/Gemfile.lock
----------------------------------------------------------------------
diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock
index 170579e..aaccff9 100644
--- a/docs/Gemfile.lock
+++ b/docs/Gemfile.lock
@@ -27,7 +27,7 @@ GEM
       maruku (~> 0.6.0)
       pygments.rb (~> 0.5.0)
       redcarpet (~> 2.3.0)
-      safe_yaml (~> 0.9.7)
+      safe_yaml (~> 1.0.4)
     kramdown (1.2.0)
     liquid (2.5.4)
     listen (1.3.1)
@@ -47,7 +47,7 @@ GEM
       ffi (>= 0.5.0)
     rdiscount (2.1.7)
     redcarpet (2.3.0)
-    safe_yaml (0.9.7)
+    safe_yaml (1.0.4)
     syntax (1.0.0)
     yajl-ruby (1.1.0)
 

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/28b478d9/docs/README.md
----------------------------------------------------------------------
diff --git a/docs/README.md b/docs/README.md
index 6a4c0de..6e5e716 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,4 +1,4 @@
-## Zeppelin documentation
+## Apache Zeppelin documentation
 
 This readme will walk you through building the Zeppelin documentation, which 
is included here with the Zeppelin source code.
 
@@ -6,15 +6,17 @@ This readme will walk you through building the Zeppelin 
documentation, which is
 ## Build documentation
 See https://help.github.com/articles/using-jekyll-with-pages#installing-jekyll
 
-**tl;dr version:**
+**Requirements**
 
 ```
-    ruby --version >= 1.9.3
+    ruby --version >= 2.0.0
     gem install bundler
     # go to /docs under your Zeppelin source
     bundle install
 ```
 
+For the further information about requirements, please see 
[here](https://help.github.com/articles/setting-up-your-github-pages-site-locally-with-jekyll/#requirements).
 
+
 *On OS X 10.9 you may need to do "xcode-select --install"*
 
 

Reply via email to