Merge branch 'release/0.2.0'

yasuhito · Sep 3, 2015 · 66d4935 · 66d4935
2 parents 4bc628c + 82e50b3
commit 66d4935
Show file tree

Hide file tree

Showing 17 changed files with 274 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,7 @@
 # Changelog
 
+## 0.2.0 (9/3/2015)
+* [#30](https://github.com/yasuhito/trema-book/pull/30): 「OpenFlow の仕組み」章のドラフト rev.1 を追加.
+
 ## 0.1.0 (8/31/2015)
 * Hello Trema 章のドラフト rev.1 を追加.
diff --git a/Guardfile b/Guardfile
@@ -1,4 +1,4 @@
-guard 'rake', task: :render do
+guard 'rake', task: :html do
   watch(/.+\.adoc$/)
 end
 

diff --git a/appendix.adoc b/appendix.adoc
@@ -0,0 +1,5 @@
+[appendix]
+= Copyright and License
+This book is released under the GNU General Public License version 3.0:
+
+- http://www.gnu.org/licenses/gpl-3.0.html
diff --git a/book.adoc b/book.adoc
@@ -1,13 +1,10 @@
 = TremaでOpenFlowプログラミング
 高宮 安仁 <yasuhito@gmail.com>; 鈴木 一哉; 松井 暢之; 村木 暢哉; 山崎 泰宏
 
-== OpenFlow って何?
-// 仮置き
+:leveloffset: 1
 
-include::hello_trema.adoc[leveloffset=+1]
+include::how_does_openflow_work.adoc[]
 
-[appendix]
-== Copyright and License
-This book is released under the GNU General Public License version 3.0:
+include::hello_trema.adoc[]
 
-- http://www.gnu.org/licenses/gpl-3.0.html
+include::appendix.adoc[]
diff --git a/how_does_openflow_work.adoc b/how_does_openflow_work.adoc
diff --git a/images/how_does_openflow_work/incredible_machine.png b/images/how_does_openflow_work/incredible_machine.png
diff --git a/images/how_does_openflow_work/openflow_host_switch.png b/images/how_does_openflow_work/openflow_host_switch.png
diff --git a/images/how_does_openflow_work/openflow_host_switch_controller.png b/images/how_does_openflow_work/openflow_host_switch_controller.png
diff --git a/images/how_does_openflow_work/yoyodyne_support.png b/images/how_does_openflow_work/yoyodyne_support.png
diff --git a/images/how_does_openflow_work/yoyodyne_support_miyasaka.png b/images/how_does_openflow_work/yoyodyne_support_miyasaka.png
diff --git a/images/whats_openflow/incredible_machine.png b/images/whats_openflow/incredible_machine.png
diff --git a/images/whats_openflow/openflow_host_switch.png b/images/whats_openflow/openflow_host_switch.png
diff --git a/images/whats_openflow/openflow_host_switch_controller.png b/images/whats_openflow/openflow_host_switch_controller.png
diff --git a/images/whats_openflow/yoyodyne_support.png b/images/whats_openflow/yoyodyne_support.png
diff --git a/images/whats_openflow/yoyodyne_support_miyasaka.png b/images/whats_openflow/yoyodyne_support_miyasaka.png
diff --git a/index.adoc b/index.adoc
@@ -2,4 +2,8 @@
 
 :leveloffset: 1
 
-include::book.adoc[]
+include::how_does_openflow_work.adoc[]
+
+include::hello_trema.adoc[]
+
+include::appendix.adoc[]
diff --git a/tasks/html.rake b/tasks/html.rake
@@ -5,7 +5,7 @@ CLOBBER << 'index.html'
 task html: 'index.html'
 
 # rubocop:disable LineLength
-file 'index.html' => ['index.adoc', 'hello_trema.adoc'] do |t|
+file 'index.html' => ['index.adoc', 'how_does_openflow_work.adoc', 'hello_trema.adoc'] do |t|
   sh "bundle exec asciidoctor -a icons=font -a toc=left -a source-highlighter=coderay -d book index.adoc --out-file #{t.name}"
 end
 # rubocop:enable LineLength